Skip to content

Conversation

lkts
Copy link
Contributor

@lkts lkts commented Sep 17, 2024

Backport

This will backport the following commits from main to 8.15:

Questions ?

Please refer to the Backport tool documentation

…lastic#112963)

(cherry picked from commit 36b3549)

# Conflicts:
#	server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
#	server/src/main/java/org/elasticsearch/index/IndexSettings.java
#	server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
#	server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java
#	x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
@lkts lkts added the backport label Sep 17, 2024
@lkts lkts added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) >non-issue :StorageEngine/Logs You know, for Logs labels Sep 17, 2024
@lkts
Copy link
Contributor Author

lkts commented Sep 17, 2024

CI failures are due to #113042, i verified that they are the only failures.

@lkts lkts merged commit 05173f2 into elastic:8.15 Sep 17, 2024
12 of 15 checks passed
@lkts lkts deleted the backport/8.15/pr-112963 branch September 17, 2024 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport >non-issue :StorageEngine/Logs You know, for Logs v8.15.2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants